(diary-mail-addr): Use bound-and-true-p.

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 1b1096bb6e1f5c94df7ea36e22654c483516293f..16b06b342dad6443318acbb4571d072bcf7ac8f8 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -210,7 +210,7 @@ with no recognizable time after those with times."
   :version "20.3")
 
 (defcustom diary-mail-addr
-  (if (boundp 'user-mail-address) user-mail-address "")
+  (or (bound-and-true-p user-mail-address) "")
   "Email address that `diary-mail-entries' will send email to."
   :group 'diary
   :type  'string